From a55d5e2c759988a83da820986fa69814f4d3dd96 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Wed, 16 Aug 2006 00:29:29 +0000 Subject: [PATCH] Force usage of common gbfile api. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2306 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/unicsv.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c index be72b2b73..3bd2ea1b1 100644 --- a/gpsbabel/unicsv.c +++ b/gpsbabel/unicsv.c @@ -24,8 +24,7 @@ #define MYNAME "unicsv" -static FILE *fin; -static textfile_t *tin; +static gbfile *file_in; /* This structure must contain only ints. Firstval must be first. * This is block initialized. @@ -129,10 +128,9 @@ unicsv_rd_init(const char *fname) char *c; unicsv_altscale = 1.0; - fin = xfopen(fname, "rb", MYNAME); - tin = textfile_init(fin); + file_in = gbfopen(fname, "rb", MYNAME); - if ((c = textfile_read(tin))) + if ((c = gbfgetstr(file_in))) unicsv_fondle_header(c); else unicsv_fieldsep = NULL; @@ -141,8 +139,7 @@ unicsv_rd_init(const char *fname) static void unicsv_rd_deinit(void) { - textfile_done(tin); - fclose(fin); + gbfclose(file_in); } static void @@ -206,7 +203,7 @@ unicsv_rd(void) if (unicsv_fieldsep == NULL) return; - while ((buff = textfile_read(tin))) { + while ((buff = gbfgetstr(file_in))) { buff = lrtrim(buff); if (*buff) unicsv_parse_one_line(buff); -- 2.30.2